projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
301afad
)
* startup.el (command-line): Fix values recognized by cursorBlink resource.
author
Chong Yidong
<cyd@gnu.org>
Sat, 14 Jan 2012 16:09:55 +0000
(
00:09
+0800)
committer
Chong Yidong
<cyd@gnu.org>
Sat, 14 Jan 2012 16:09:55 +0000
(
00:09
+0800)
lisp/ChangeLog
patch
|
blob
|
history
lisp/startup.el
patch
|
blob
|
history
diff --git
a/lisp/ChangeLog
b/lisp/ChangeLog
index 81556de8934917b0b48de391364dfa04b28b7acd..b90a40a17ae1f5331d306607a3c074f6985ff7a3 100644
(file)
--- a/
lisp/ChangeLog
+++ b/
lisp/ChangeLog
@@
-1,6
+1,7
@@
2012-01-14 Chong Yidong <cyd@gnu.org>
* startup.el (command-line): Fix X resource class for cursorColor.
+ Fix values recognized by the cursorBlink resource.
2012-01-14 Paul Eggert <eggert@cs.ucla.edu>
diff --git
a/lisp/startup.el
b/lisp/startup.el
index 44e0708e3a9a4d5c2d197e376466ec00f6b5692b..41056f3907e3fdd2048e1638e07ad0bbc9fe8036 100644
(file)
--- a/
lisp/startup.el
+++ b/
lisp/startup.el
@@
-929,7
+929,7
@@
opening the first frame (e.g. open a connection to an X server).")
emacs-basic-display
(and (memq window-system '(x w32 ns))
(not (member (x-get-resource "cursorBlink" "CursorBlink")
- '("
off" "false
")))))
+ '("
no" "off" "false" "0
")))))
(setq no-blinking-cursor t))
;; Re-evaluate predefined variables whose initial value depends on